Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <[email protected]>
Mon, 18 Oct 2010 20:23:36 +0000 (22:23 +0200)
committerWolfgang Denk <[email protected]>
Mon, 18 Oct 2010 20:23:36 +0000 (22:23 +0200)

Trivial merge